closes #11: made auto positioning more awesome
Merge remote-tracking branch 'origin/master'