Fixes #49 initial commit