Merge pull request #5 from shapeblue/andrijapanicsb-patch-1

with -->without