Fix/auto height

Will fix #20