Merge pull request #26 from jensitus/master

last