Merge/pr#12

merging is weird