merge cosinuz/master

clean merge of #6
fix #4

Thanks again @cosinuz