#29 merged into master