Merge pull request #11 from a1mueller/master

4/30 merge