Dev

The latest pull request with all tests