Merge pull request #2 from stulees/master

Additional base files and setup