Merge #5 into master