mantis #48
Merge pull request #47 from gailin24px/master

mantis #48 + revision mantis #37