Merge pull request #17 from delasky/master

merg