Merge #24 into master