dansimco Merge pull request #8 from dansimco/dev