Update based on @edjafarov feedback

See #4 for more information