resolved conflicts
Merge pull request #6 from mcwic/master

resolved conflicts