diff --git a/FAQ.md b/FAQ.md
index acd5872..1935756 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,3 +1,8 @@
 # FAQ (Known Problems)
 
--- none at the moment --
\ No newline at end of file
+## Remix and Solidity 0.5.0
+Remix had some problems with the recent Solidity 0.5.0 update
+
+We have updated the code so it works with Solidity 0.5.0 as well. You might want to look into 
+https://solidity.readthedocs.io/en/v0.5.0/050-breaking-changes.html
+and make sure your code is compliant.
\ No newline at end of file
diff --git a/S01/ex1.sol b/S01/ex1.sol
index dbf394e..68ad48e 100644
--- a/S01/ex1.sol
+++ b/S01/ex1.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract ExampleOne {
 
diff --git a/S01/ex2.sol b/S01/ex2.sol
index fc6da96..85f1a66 100644
--- a/S01/ex2.sol
+++ b/S01/ex2.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract MyContract {
     
diff --git a/S01/ex3.sol b/S01/ex3.sol
index da19d5f..4714e0e 100644
--- a/S01/ex3.sol
+++ b/S01/ex3.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract MyContract {
 
diff --git a/S01/ex4_constructor.sol b/S01/ex4_constructor.sol
index b6ec43a..00efe20 100644
--- a/S01/ex4_constructor.sol
+++ b/S01/ex4_constructor.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract MyContract {
 
diff --git a/S01/ex5_modifier.sol b/S01/ex5_modifier.sol
index d882d05..48cee65 100644
--- a/S01/ex5_modifier.sol
+++ b/S01/ex5_modifier.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract MyContract {
     uint public myVarOne;
diff --git a/S01/ex6.sol b/S01/ex6.sol
index 4a9620e..8d174ee 100644
--- a/S01/ex6.sol
+++ b/S01/ex6.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract MyContract {
 
diff --git a/S01/ex7_mappings.sol b/S01/ex7_mappings.sol
index 47c81f3..f000216 100644
--- a/S01/ex7_mappings.sol
+++ b/S01/ex7_mappings.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract MyContract {
 
diff --git a/S01/ex8_structs.sol b/S01/ex8_structs.sol
index caa9f6c..1c592da 100644
--- a/S01/ex8_structs.sol
+++ b/S01/ex8_structs.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract MyContract {
 
diff --git a/S05 - Truffle Framework/contracts/Notary.sol b/S05 - Truffle Framework/contracts/Notary.sol
index 3c9d3d9..47bee0c 100644
--- a/S05 - Truffle Framework/contracts/Notary.sol	
+++ b/S05 - Truffle Framework/contracts/Notary.sol	
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract Notary {
 
diff --git a/S06/L07 - Truffle Webpack 3 Input fields/contracts/Notary.sol b/S06/L07 - Truffle Webpack 3 Input fields/contracts/Notary.sol
index 3c9d3d9..47bee0c 100644
--- a/S06/L07 - Truffle Webpack 3 Input fields/contracts/Notary.sol	
+++ b/S06/L07 - Truffle Webpack 3 Input fields/contracts/Notary.sol	
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract Notary {
 
diff --git a/S06/L08 - File Hashing in JavaScript/contracts/Notary.sol b/S06/L08 - File Hashing in JavaScript/contracts/Notary.sol
index 3c9d3d9..47bee0c 100644
--- a/S06/L08 - File Hashing in JavaScript/contracts/Notary.sol	
+++ b/S06/L08 - File Hashing in JavaScript/contracts/Notary.sol	
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract Notary {
 
diff --git a/S06/L09 - Read Entries from the Smart Contract/contracts/Notary.sol b/S06/L09 - Read Entries from the Smart Contract/contracts/Notary.sol
index 3c9d3d9..47bee0c 100644
--- a/S06/L09 - Read Entries from the Smart Contract/contracts/Notary.sol	
+++ b/S06/L09 - Read Entries from the Smart Contract/contracts/Notary.sol	
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity >=0.4.24 <0.6.0;
 
 contract Notary {