Merge pull request #6 from jtinfors/master