Fixes #3 and new Build