Merge pull request #53 from dtalayco/master

changes from loxigen e8e6401509