done
done v2
done v3
Merge pull request #65 from Neodelf/fixes

done