Merge pull request #61 from markt-asf/merge-from-master

Merge from master