added for issues/8
Merge pull request #9 from fotto/master

added for issues/8