Added fixes pointed out and coded by @Garkin (Thanks)
Changed minor version to 0.07