V0.1 stable merge

\o/