danielpassos Merge branch 'pr/3'

Latest commit e8cb492

Apr 10, 2017