Update, 11-13-2014
Merge pull request #27 from pglibay/master

Update, 11-13-2014