Fixes #19 - Merge changes