Merge pull request #5 from dustinmoorman/master

Getting the experimental branch up to date. Merge from master.
Merge pull request #6 from dustinmoorman/master

Bringing experimental branch up to date. Merged from master.
Merge pull request #7 from dustinmoorman/experimental

Experimental merged to master.