Took @lekoala issue into account
Merge branch 'get-in/issue-13'