addressed issue #18 and issue #24, made some changes regarding issue #8, various improvements and minor bug corrections.