Merge pull request #37 from ningosi/master

tickets fixes
Merge remote-tracking branch 'upstream/master'