Fixed #6
Minor fixes