Misc fix
Merge pull request #1 from palon7/master

Misc fix