Commit to master branch
Test fix issue 53
Hot fix bugs
Merge branch 'iss53'