Merge pull request #30 from tisdall/master

pull request for Issue #28
Merge branch 'master', remote branch 'upstream/master'