Initial merge with master (#51)

Signed-off-by: Andrea Cappelli <a.cappelli87@gmail.com>