Closes #43 Preparing for open source