Merge pull request #47 from EricWittmann/master

Replace master with work done on "1.0" branch
Merge pull request #48 from EricWittmann/master

Some changes due to errai updates