modified for April 14 3W
modified for April 14 3W(with fixes)
Merge pull request #13 from brianmcdonald/master

Modified to use April 3W