Version 0.5.4 added, fixed major bug