Initial release

- Fixed minor bugs form original version