Final changes by macoi - 03/28/2014
Merge pull request #4 from macoiteradata/master

Final changes by macoi - 03/28/2014