Added minor bugfixing.
Initial release 1.1