Merge pull request #4 from RN3ARA/master

Should fix #12