alpha.7

Work on #35