awd
Merge https://github.com/pasihu/whee

Conflicts:
	.idea/workspace.xml
Final commit