#7 -- WIP

Fixed an issue with last commit