Merge pull request #187 from amai2012/master

Fix compiler warning: extra ';' after member function definition