Fixed #101 and added maven stuff