Merge pull request #21 from ricsp/master

All branches should be at the newest status