Merged #7 . thanks @doun