Few minor updates and fixes #325

Closed segevsh closed 9 years ago