All previous work
Merge pull request #1 from local-minimum/initMerge

All previous work