Merge pull request #8 from olamothe/master

!combine
Merge commit '01662e867f2256b39fdcfb6cf922cf0fe9b48581'