Merge pull request #51 from el-med/master

switch to wak8 branch
switch to wak8