Issue 85

This branch will make static-analysis branch obsolete.

Closes #85