Merge pull request #12 from dangowrt/master