Resolve issue #30
Resolve multiple bugs
Removed echoed info