Other fixes #73
Merge pull request #74 from emreefendioglu/master

Other fixes #73