Merge pull request #2 from mgartner/open-source-stuff

Open source stuff