Merge pull request #17 from theodi/master

pulling from master