Merge pull request #48 from gailin24px/master

revision mantis #48