Merge pull request #68 from chrqls/dev

Changes for issues #47 and #54