Following issues fixed:
#15
#16
#19
#21
#23
#25
#28
#30