Updating to current vesion as of 6/2/2013.  Warning: this version is not tested stable and may have bugs!
Merge pull request #1 from msandstedt/master

Updating to current vesion as of 6/2/2013.